Use comment status and type to set $maybe_notify default #10489
Conversation
|
The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the Core Committers: Use this line as a base for the props when committing in SVN: To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
Test using WordPress PlaygroundThe changes in this pull request can previewed and tested using a WordPress Playground instance. WordPress Playground is an experimental project that creates a full WordPress instance entirely within the browser. Some things to be aware of
For more details about these limitations and more, check out the Limitations page in the WordPress Playground documentation. |
| $maybe_notify = $is_note ? get_option( 'wp_notes_notify' ) : get_option( 'comments_notify' ); | ||
|
|
||
| // By default, only notify for approved comments and notes. | ||
| if ( | ||
| ! isset( $comment->comment_approved ) || | ||
| ( '1' !== $comment->comment_approved && ! $is_note ) ) { | ||
| $maybe_notify = false; | ||
| } |
There was a problem hiding this comment.
Maybe this refactor into a single if/elseif/else statement is easier to reason about?
| $maybe_notify = $is_note ? get_option( 'wp_notes_notify' ) : get_option( 'comments_notify' ); | |
| // By default, only notify for approved comments and notes. | |
| if ( | |
| ! isset( $comment->comment_approved ) || | |
| ( '1' !== $comment->comment_approved && ! $is_note ) ) { | |
| $maybe_notify = false; | |
| } | |
| // By default, only notify for approved comments and notes. | |
| if ( | |
| ! isset( $comment->comment_approved ) || | |
| ( '1' !== $comment->comment_approved && ! $is_note ) | |
| ) { | |
| $maybe_notify = false; | |
| } else if ( $is_note ) { | |
| $maybe_notify = get_option( 'wp_notes_notify' ); | |
| } else { | |
| $maybe_notify = get_option( 'comments_notify' ) | |
| } |
There was a problem hiding this comment.
Aside: Will $comment->comment_approved ever be not-set or null? It's default value is '1' and it is typed as a string. Doesn't hurt, but just curious. If so, then ! isset( $comment->comment_approved ) could be removed.
There was a problem hiding this comment.
This will change the logic slightly. If get_option( 'comments_notify' ) is true and '1' !== $comment->comment_approved and the type is a comment, the default should be false. This would make it true. I will try to make the logic clearer, maybe remove the trinary or add inline docs.
2 participants
Trac ticket: https://core.trac.wordpress.org/ticket/64217
This Pull Request is for code review only. Please keep all other discussion in the Trac ticket. Do not merge this Pull Request. See GitHub Pull Requests for Code Review in the Core Handbook for more details.